merge
authorAlastair Tse <atse@xensource.com>
Fri, 1 Dec 2006 11:08:34 +0000 (11:08 +0000)
committerAlastair Tse <atse@xensource.com>
Fri, 1 Dec 2006 11:08:34 +0000 (11:08 +0000)
commitd60a8ce29fc98d2312150d25a4e0fdb0469d126b
treeabd739ddaf72c4bf94747252574d11122451bfee
parentbd8806fb71aebdab6289dd42cab8e84301d060ff
parente4022aef8e9076a5ffe70abfd2fff6fee5c99512
merge